Reduce usage of unstable features

diff --git a/src/bin/bench.rs b/src/bin/bench.rs
index 00edc0051d0b16fbec0f11c309d15e05fe3080b7..d910784e6bb579a599b9401cd38161e76c17c43b 100644 (file)
--- a/src/bin/bench.rs
+++ b/src/bin/bench.rs
@@ -51,17 +51,17 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
     config.shell().set_verbose(options.flag_verbose);
 
     let ops = ops::TestOptions {
-        name: options.flag_bench.as_ref().map(|s| s.as_slice()),
+        name: options.flag_bench.as_ref().map(|s| &s[..]),
         no_run: options.flag_no_run,
         compile_opts: ops::CompileOptions {
             env: "bench",
             config: config,
             jobs: options.flag_jobs,
-            target: options.flag_target.as_ref().map(|s| s.as_slice()),
+            target: options.flag_target.as_ref().map(|s| &s[..]),
             dev_deps: true,
             features: &options.flag_features,
             no_default_features: options.flag_no_default_features,
-            spec: options.flag_package.as_ref().map(|s| s.as_slice()),
+            spec: options.flag_package.as_ref().map(|s| &s[..]),
             lib_only: false,
             exec_engine: None,
         },

diff --git a/src/bin/build.rs b/src/bin/build.rs
index 0784c047a971ea0370070a9c0ab41fcba1906ba3..3408f40774d25e408d3adc7fc4d66d1e0ff9b6e8 100644 (file)
--- a/src/bin/build.rs
+++ b/src/bin/build.rs
@@ -62,11 +62,11 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         env: env,
         config: config,
         jobs: options.flag_jobs,
-        target: options.flag_target.as_ref().map(|t| t.as_slice()),
+        target: options.flag_target.as_ref().map(|t| &t[..]),
         dev_deps: false,
         features: &options.flag_features,
         no_default_features: options.flag_no_default_features,
-        spec: options.flag_package.as_ref().map(|s| s.as_slice()),
+        spec: options.flag_package.as_ref().map(|s| &s[..]),
         lib_only: options.flag_lib,
         exec_engine: None,
     };

diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index c381d728a136a1a1dcb32f14442c87035cbef793..7707762cd6a250f3417b27fa65ad84a4ed7bf756 100644 (file)
--- a/src/bin/cargo.rs
+++ b/src/bin/cargo.rs
@@ -1,4 +1,4 @@
-#![feature(collections, core, io, path, fs, std_misc, os, old_io, exit_status)]
+#![feature(core, io, path, std_misc, exit_status)]
 
 extern crate "git2-curl" as git2_curl;
 extern crate "rustc-serialize" as rustc_serialize;
@@ -10,7 +10,6 @@ extern crate toml;
 use std::collections::BTreeSet;
 use std::env;
 use std::fs;
-use std::io::prelude::*;
 use std::io;
 use std::path::{PathBuf, Path};
 use std::process::Command;
@@ -210,7 +209,7 @@ fn list_commands() -> BTreeSet<String> {
                 let command = &filename[
                     command_prefix.len()..
                     filename.len() - env::consts::EXE_SUFFIX.len()];
-                commands.insert(String::from_str(command));
+                commands.insert(command.to_string());
             }
         }
     }
@@ -225,7 +224,7 @@ fn list_commands() -> BTreeSet<String> {
 #[cfg(unix)]
 fn is_executable(path: &Path) -> bool {
     use std::os::unix::prelude::*;
-    path.metadata().map(|m| {
+    fs::metadata(path).map(|m| {
         m.permissions().mode() & 0o001 == 0o001
     }).unwrap_or(false)
 }
@@ -239,7 +238,7 @@ fn find_command(cmd: &str) -> Option<PathBuf> {
     let command_exe = format!("cargo-{}{}", cmd, env::consts::EXE_SUFFIX);
     let dirs = list_command_directory();
     let mut command_paths = dirs.iter().map(|dir| dir.join(&command_exe));
-    command_paths.find(|path| path.exists())
+    command_paths.find(|path| fs::metadata(&path).is_ok())
 }
 
 /// List candidate locations where subcommands might be installed.

diff --git a/src/bin/clean.rs b/src/bin/clean.rs
index a530b9b245a478bd93bc595370dddb11d2af5e85..cc66f29fdcf53cebd391ebe08c17490168bd4174 100644 (file)
--- a/src/bin/clean.rs
+++ b/src/bin/clean.rs
@@ -38,8 +38,8 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
     let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path));
     let opts = ops::CleanOptions {
         config: config,
-        spec: options.flag_package.as_ref().map(|s| s.as_slice()),
-        target: options.flag_target.as_ref().map(|s| s.as_slice()),
+        spec: options.flag_package.as_ref().map(|s| &s[..]),
+        target: options.flag_target.as_ref().map(|s| &s[..]),
     };
     ops::clean(&root, &opts).map(|_| None).map_err(|err| {
       CliError::from_boxed(err, 101)

diff --git a/src/bin/doc.rs b/src/bin/doc.rs
index 0aba6b5bb7884deca95ecbddeb0e6bc0f9c6b6ac..dbb1b5ab4f923b9520cf56f5c39d2a048e223802 100644 (file)
--- a/src/bin/doc.rs
+++ b/src/bin/doc.rs
@@ -56,7 +56,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
             dev_deps: false,
             features: &options.flag_features,
             no_default_features: options.flag_no_default_features,
-            spec: options.flag_package.as_ref().map(|s| s.as_slice()),
+            spec: options.flag_package.as_ref().map(|s| &s[..]),
             lib_only: false,
             exec_engine: None,
         },

diff --git a/src/bin/login.rs b/src/bin/login.rs
index 2726c937cf8e9a77beaf4907d91e8c9f939ca81c..16c8f7c85ccb5ca3d009bebb82b56097545a7fa3 100644 (file)
--- a/src/bin/login.rs
+++ b/src/bin/login.rs
@@ -1,4 +1,5 @@
-use std::old_io;
+use std::io::prelude::*;
+use std::io;
 
 use cargo::ops;
 use cargo::core::{SourceId, Source};
@@ -38,7 +39,9 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
                 let host = options.flag_host.clone().unwrap_or(config.api);
                 println!("please visit {}me and paste the API Token below",
                          host);
-                let line = try!(old_io::stdin().read_line());
+                let mut line = String::new();
+                let input = io::stdin();
+                try!(input.lock().read_line(&mut line));
                 Ok(line)
             })();
 

diff --git a/src/bin/pkgid.rs b/src/bin/pkgid.rs
index f0409b11f24d8de706efab42925a4f21e4abccf3..c5fe8de37d960dbba78d189eb4e963b4248c74ba 100644 (file)
--- a/src/bin/pkgid.rs
+++ b/src/bin/pkgid.rs
@@ -46,7 +46,7 @@ pub fn execute(options: Options,
     config.shell().set_verbose(options.flag_verbose);
     let root = try!(find_root_manifest_for_cwd(options.flag_manifest_path.clone()));
 
-    let spec = options.arg_spec.as_ref().map(|s| s.as_slice());
+    let spec = options.arg_spec.as_ref().map(|s| &s[..]);
     let spec = try!(ops::pkgid(&root, spec, config).map_err(|err| {
       CliError::from_boxed(err, 101)
     }));

diff --git a/src/bin/run.rs b/src/bin/run.rs
index 2b8c7b9733b641ed6a2d79e8ca61f73e89b19b24..f786832a2b1caccac87202c1b61f973955fcda35 100644 (file)
--- a/src/bin/run.rs
+++ b/src/bin/run.rs
@@ -57,7 +57,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         env: env,
         config: config,
         jobs: options.flag_jobs,
-        target: options.flag_target.as_ref().map(|t| t.as_slice()),
+        target: options.flag_target.as_ref().map(|t| &t[..]),
         dev_deps: true,
         features: &options.flag_features,
         no_default_features: options.flag_no_default_features,

diff --git a/src/bin/test.rs b/src/bin/test.rs
index 7eedac427ecdf9f6fb2bb99cb9d2469278995ed5..6c7e18e63e932fe75790486d8d194e09d72c715c 100644 (file)
--- a/src/bin/test.rs
+++ b/src/bin/test.rs
@@ -53,17 +53,17 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
     config.shell().set_verbose(options.flag_verbose);
 
     let ops = ops::TestOptions {
-        name: options.flag_test.as_ref().map(|s| s.as_slice()),
+        name: options.flag_test.as_ref().map(|s| &s[..]),
         no_run: options.flag_no_run,
         compile_opts: ops::CompileOptions {
             env: "test",
             config: config,
             jobs: options.flag_jobs,
-            target: options.flag_target.as_ref().map(|s| s.as_slice()),
+            target: options.flag_target.as_ref().map(|s| &s[..]),
             dev_deps: true,
             features: &options.flag_features,
             no_default_features: options.flag_no_default_features,
-            spec: options.flag_package.as_ref().map(|s| s.as_slice()),
+            spec: options.flag_package.as_ref().map(|s| &s[..]),
             lib_only: false,
             exec_engine: None,
         },

diff --git a/src/bin/update.rs b/src/bin/update.rs
index 4fdeebfb68529de081c750372346025dd998db44..61df563d30b2a09d0c920b5945bd3a29f88119a2 100644 (file)
--- a/src/bin/update.rs
+++ b/src/bin/update.rs
@@ -57,8 +57,8 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
 
     let update_opts = ops::UpdateOptions {
         aggressive: options.flag_aggressive,
-        precise: options.flag_precise.as_ref().map(|s| s.as_slice()),
-        to_update: spec.map(|s| s.as_slice()),
+        precise: options.flag_precise.as_ref().map(|s| &s[..]),
+        to_update: spec.map(|s| &s[..]),
         config: config,
     };
 

diff --git a/src/bin/verify_project.rs b/src/bin/verify_project.rs
index 33c271a9e5eb23c6a2b47e1a8852d9abd6371394..43056c13d2589308b86811c790bf4f318af854c5 100644 (file)
--- a/src/bin/verify_project.rs
+++ b/src/bin/verify_project.rs
@@ -32,10 +32,9 @@ pub fn execute(args: Flags, config: &Config) -> CliResult<Option<Error>> {
     let file = File::open(&args.flag_manifest_path);
     match file.and_then(|mut f| f.read_to_string(&mut contents)) {
         Ok(()) => {},
-        Err(e) => return fail("invalid", format!("error reading file: {}",
-                                                 e).as_slice())
+        Err(e) => return fail("invalid", &format!("error reading file: {}", e))
     };
-    match toml::Parser::new(contents.as_slice()).parse() {
+    match toml::Parser::new(&contents).parse() {
         None => return fail("invalid", "invalid-format"),
         Some(..) => {}
     };